Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upp machinegunner tweaks #198

Merged
merged 8 commits into from
May 2, 2024
Merged

Conversation

AndroBetel
Copy link
Contributor

@AndroBetel AndroBetel commented Mar 31, 2024

upp iff machinegun can no longer be fired without a harness
upp iff machinegun has higher slowdown when wielded
adds heavy plated harness to upp machinegunners
you can no longer wear backpacks with upp heavy plated harnesses

adds a couple boxes of mg rounds to machinegunners (they still have only 1750 vs 3000)
nerfs machinegunner armor slots to 1
adds machinegunner belts
image

@AndroBetel AndroBetel marked this pull request as draft March 31, 2024 01:02
@AndroBetel AndroBetel changed the title nerfs upp mg upp machinegunner tweaks Mar 31, 2024
@AndroBetel AndroBetel marked this pull request as ready for review March 31, 2024 02:46
/obj/item/storage/belt/marine/smartgunner/upp/fill_preset_inventory()
return

/obj/item/storage/belt/marine/smartgunner/upp/shotgun/fill_preset_inventory()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errr is this right? Smartgunner shotgun rounds?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the sprite seemed kind of similar to shotgun belt to me so i decided to play more with that

	desc = "Recently adopted by UPP military, this belt allows machinegunners to carry more ammo boxes into battle. It also found use with SOF breachers using Type 23 shotguns."

i also needed some container to keep shells in bcuz we had no upp shells box and i came up with that idea

@morrowwolf morrowwolf marked this pull request as draft April 1, 2024 17:08
@AndroBetel AndroBetel marked this pull request as ready for review April 1, 2024 20:46
@Merrgear
Copy link
Contributor

Merrgear commented Apr 7, 2024

can no longer run normal armor as UPP MG, very sad

Copy link

github-actions bot commented Apr 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@morrowwolf
Copy link
Member

Waiting review changes

@morrowwolf morrowwolf marked this pull request as draft April 10, 2024 01:34
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@AndroBetel AndroBetel marked this pull request as ready for review April 17, 2024 15:10
@morrowwolf morrowwolf merged commit f5025c6 into cmss13-devs:master May 2, 2024
36 checks passed
AndroBetel added a commit to kirieee/PvE-CMSS13 that referenced this pull request Jun 1, 2024
AndroBetel added a commit to kirieee/PvE-CMSS13 that referenced this pull request Jun 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants